Remove FIX_RSDP_PAGE. Access RSDP via the 'isamap' of low 1MB.

Signed-off-by: Keir Fraser <keir@xensource.com>

diff --git a/linux-2.6-xen-sparse/arch/xen/i386/kernel/acpi/boot.c b/linux-2.6-xen-sparse/arch/xen/i386/kernel/acpi/boot.c
index 19e71d8d2b13536e2458ad551dde620a405b244e..96ee1a68ceafc59094c52e54a33743a568d341a1 100644 (file)
--- a/linux-2.6-xen-sparse/arch/xen/i386/kernel/acpi/boot.c
+++ b/linux-2.6-xen-sparse/arch/xen/i386/kernel/acpi/boot.c
@@ -660,8 +660,6 @@ acpi_find_rsdp (void)
        if (!rsdp_phys)
                rsdp_phys = acpi_scan_rsdp (0xE0000, 0x20000);
 
-       set_fixmap(FIX_ACPI_RSDP_PAGE, rsdp_phys);
-
        return rsdp_phys;
 }
 

diff --git a/linux-2.6-xen-sparse/drivers/acpi/tables.c b/linux-2.6-xen-sparse/drivers/acpi/tables.c
index a849e65c8531debe69a130e23171ccd674e04086..4abd09de684e899f6dbe2c66057d7962301fa42b 100644 (file)
--- a/linux-2.6-xen-sparse/drivers/acpi/tables.c
+++ b/linux-2.6-xen-sparse/drivers/acpi/tables.c
@@ -566,8 +566,7 @@ acpi_table_get_sdt (
  * result: sdt_entry[] is initialized
  */
 #if defined(CONFIG_XEN_X86) || defined(CONFIG_XEN_X86_64)
-#define acpi_rsdp_phys_to_va(rsdp_phys) (__fix_to_virt(FIX_ACPI_RSDP_PAGE) + \
-                                          (rsdp_phys & ~PAGE_MASK))
+#define acpi_rsdp_phys_to_va(rsdp_phys) isa_bus_to_virt(rsdp_phys)
 #else
 #define acpi_rsdp_phys_to_va(rsdp_phys) __va(rsdp_phys)
 #endif

diff --git a/linux-2.6-xen-sparse/include/asm-xen/asm-i386/fixmap.h b/linux-2.6-xen-sparse/include/asm-xen/asm-i386/fixmap.h
index c2dcf5a33efb04105b5d4ab69def92045a26d968..caac2e3f7cea6b91b124b511bae047e0d3c7757e 100644 (file)
--- a/linux-2.6-xen-sparse/include/asm-xen/asm-i386/fixmap.h
+++ b/linux-2.6-xen-sparse/include/asm-xen/asm-i386/fixmap.h
@@ -80,7 +80,6 @@ enum fixed_addresses {
 #ifdef CONFIG_ACPI_BOOT
        FIX_ACPI_BEGIN,
        FIX_ACPI_END = FIX_ACPI_BEGIN + FIX_ACPI_PAGES - 1,
-       FIX_ACPI_RSDP_PAGE,
 #endif
 #ifdef CONFIG_PCI_MMCONFIG
        FIX_PCIE_MCFG,

diff --git a/linux-2.6-xen-sparse/include/asm-xen/asm-x86_64/fixmap.h b/linux-2.6-xen-sparse/include/asm-xen/asm-x86_64/fixmap.h
index 6d429e11756576179c42fd3b73bc39b860a18ea3..4da91b46dedff94de97a43eed9b124ec3de05f02 100644 (file)
--- a/linux-2.6-xen-sparse/include/asm-xen/asm-x86_64/fixmap.h
+++ b/linux-2.6-xen-sparse/include/asm-xen/asm-x86_64/fixmap.h
@@ -50,7 +50,6 @@ enum fixed_addresses {
 #ifdef CONFIG_ACPI_BOOT
        FIX_ACPI_BEGIN,
        FIX_ACPI_END = FIX_ACPI_BEGIN + FIX_ACPI_PAGES - 1,
-       FIX_ACPI_RSDP_PAGE,
 #endif
        FIX_SHARED_INFO,
        FIX_GNTTAB_BEGIN,